From 4219f4a20e306cada63fd154ea897c029d610d63 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 7 Jul 2015 16:40:31 +0100 Subject: [PATCH] tools: Link in-tree libvchan and libblktapctl users against lib....so As with other in-tree users avoid -L + -l. This avoids any confusion with versions of these libraries already installed on the system and the possibility of linking against them by mistake. Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Ian Jackson --- tools/Rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 3c29d07898..2c422bde9b 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -51,7 +51,7 @@ LDLIBS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBXENSTAT)/ SHLIB_libxenstat = -Wl,-rpath-link=$(XEN_LIBXENSTAT) CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) -LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan +LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBVCHAN)/libxenvchan$(libextension) SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) ifeq ($(debug),y) @@ -65,7 +65,7 @@ LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2) ifeq ($(LIBXL_BLKTAP),y) CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) -LDLIBS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl +LDLIBS_libblktapctl = $(XEN_BLKTAP2)/control/libblktapctl$(libextension) SHLIB_libblktapctl = -Wl,-rpath-link=$(XEN_BLKTAP2)/control else CFLAGS_libblktapctl = -- 2.30.2